package com.qfedu.app;

public class App {
    public static void main(String[] args) {
        System.out.println("git test");
        System.out.println("修改");
        System.out.println("牛逼666");
        System.out.println("冲突");
        System.out.println("牛逼999");
        System.out.println("牛逼777");
        System.out.println("dev");
        System.out.println("dev2");
        System.out.println("dev3");
        System.out.println("dev3");
        System.out.println("dev修改");
        System.out.println("二次修改");
        System.out.println("冲突");
    }

}
